resolving conflict

join shbcf.ru